more changes to work on all servers