some updates to live version