-last changes from omni + brightness (omni)