Changed some stuff with handling the request