done some changes from staging branch