made necessary changes to get it working on uat