final changes from staging server