Started Light re-factoring