Making it work on server