[DEV] Optimisation and lighting fix