#16 improved response messages