Fixing stage 1 (11/24)

Fixing stage 1