Fixing stage 1 (6/24)

Fixing stage 1