Live lunch Fix & tunning

Tested