Fixing c stage (8/20)

Fixing c stage