changed for server side