Downstairs: Optimization and bugs fixed

Optimization and bugs fixed