Fixing stage 1 (3/24)

Fixing stage 1