Fixing stage 1 (16/24)

Fixing stage 1