solved some issues with it
Merge branch 'chat_lightup'