Changed coding to server style