Still need better lighting