Fixing stage 1 (9/24)

Fixing stage 1