code merged and lighting working