Feature/light update