Updated server to test on bilbo