changes to ensure working in deploment