Optimized object rendering, disabled puzzle again