[master] Trying to make it run on server