Fixing stage 1 (7/24)

Fixing stage 1