updated with some response codes