a few changes to make sure it runs nice on the server