changed for server usage