Refactor Of light updates