Fixing c stage (7/20)

Fixing c stage