Updated server to be more responsive