Few changes to make live version work correctly