Fixing stage 1 (15/24)

Fixing stage 1