new version with lighting