Updated to run on server