Made changes so now it should work on the server