various changes on live server
merging changes