Updated to test on a real server