change the way we handle controllers responses