Updated to work on server, hopefully