Add more feedback to  and