Pregada master

refactor light...