Changes to run as server