diff --git a/laborator/content/buffer-overflow/1-data-buffer/data_buffer b/laborator/content/buffer-overflow/1-data-buffer/data_buffer
new file mode 100755
index 00000000..b14f5fbd
Binary files /dev/null and b/laborator/content/buffer-overflow/1-data-buffer/data_buffer differ
diff --git a/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer b/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer
new file mode 100755
index 00000000..dd361968
Binary files /dev/null and b/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer differ
diff --git a/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer.asm b/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer.asm
index ce109d6d..963271bf 100644
--- a/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer.asm
+++ b/laborator/content/buffer-overflow/2-3-4-stack-buffer/stack_buffer.asm
@@ -47,6 +47,12 @@ fill_byte:
     cmp ecx, 64
     jl fill_byte
 
+    mov byte [ebx+64], 0xEF ; the least significant byte
+    mov byte [ebx+65], 0xBE ; the next byte
+    mov byte [ebx+66], 0xAD ; the next byte
+    mov byte [ebx+67], 0xDE ; the most significant byte
+
+
     ; Print data in buffer.
     push buffer_intro_message
     call printf
@@ -67,7 +73,7 @@ print_byte:
 
     pop ecx	; restore ecx
     inc ecx
-    cmp ecx, 64
+    cmp ecx, 80 ; change the limit from 64 to 80 to read beyond the buffer
     jl print_byte
 
     ; Print new line. C equivalent instruction is puts("").
diff --git a/laborator/content/buffer-overflow/5-6-read-stdin/payload b/laborator/content/buffer-overflow/5-6-read-stdin/payload
new file mode 100644
index 00000000..378f94e2
--- /dev/null
+++ b/laborator/content/buffer-overflow/5-6-read-stdin/payload
@@ -0,0 +1 @@
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFLOW
diff --git a/laborator/content/buffer-overflow/5-6-read-stdin/read_stdin b/laborator/content/buffer-overflow/5-6-read-stdin/read_stdin
new file mode 100755
index 00000000..098ab656
Binary files /dev/null and b/laborator/content/buffer-overflow/5-6-read-stdin/read_stdin differ
diff --git a/laborator/content/buffer-overflow/7-read-stdin-fgets/payload b/laborator/content/buffer-overflow/7-read-stdin-fgets/payload
new file mode 100644
index 00000000..378f94e2
--- /dev/null
+++ b/laborator/content/buffer-overflow/7-read-stdin-fgets/payload
@@ -0,0 +1 @@
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFLOW
diff --git a/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets b/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets
new file mode 100755
index 00000000..630ea8d0
Binary files /dev/null and b/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets differ
diff --git a/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets.asm b/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets.asm
new file mode 100644
index 00000000..520846cb
--- /dev/null
+++ b/laborator/content/buffer-overflow/7-read-stdin-fgets/read_stdin_fgets.asm
@@ -0,0 +1,95 @@
+;
+; IOCLA, Buffer management
+;
+; Fill buffer with data from standard input.
+; Buffer is stored on the stack.
+;
+
+extern printf
+extern puts
+extern strlen
+extern fgets
+extern stdin
+
+section .data
+    read_message: db "insert buffer string: ", 0
+    buffer_intro_message: db "buffer is:", 0
+    byte_format: db " %02X(%c)", 0
+    null_string: db 0
+    var_message_and_format: db "var is 0x%08X", 13, 10, 0
+
+section .text
+
+global main
+
+main:
+    push ebp
+    mov ebp, esp
+
+    ; Make room for local variable (32 bit, 4 bytes).
+    ; Variable address is at ebp-4.
+    sub esp, 4
+
+    ; Make room for buffer (64 bytes).
+    ; Buffer address is at ebp-68.
+    sub esp, 64
+
+    ; Initialize local variable.
+    mov dword [ebp-4], 0xCAFEBABE
+
+    ; Read buffer from standard input.
+    push read_message
+    call printf
+    add esp, 4
+
+    lea ebx, [ebp-68]
+    push dword [stdin]
+    push 80; size of the buffer to read
+    push ebx
+    call fgets
+    add esp, 12
+
+    ; Push string length on the stack.
+    ; String length is stored at ebp-72.
+    push ebx
+    call strlen
+    add esp, 4
+    push eax
+
+    ; Print data in buffer.
+    push buffer_intro_message
+    call printf
+    add esp, 4
+
+    xor ecx, ecx
+print_byte:
+    xor eax, eax
+    lea ebx, [ebp-68]
+    mov al, byte[ebx+ecx]
+    push ecx	; save ecx
+
+    ; Print current byte.
+    push eax
+    push eax
+    push byte_format
+    call printf
+    add esp, 12
+
+    pop ecx	; restore ecx
+    inc ecx
+    cmp ecx, [ebp-72]
+    jl print_byte
+
+    push null_string
+    call puts
+    add esp, 4
+
+    ; Print local variable.
+    mov eax, [ebp-4]
+    push eax
+    push var_message_and_format
+    call printf
+    add esp, 8
+
+    leave
+    ret