Escape Room Collection C1: optimize

Performance optimization and increased macOs version