Fixing stage 1 (24/24)

Fixing stage 1