Fixing stage 1 (20/24)

Fixing stage 1