Reimplemented the lighting system