Added conditional to response