added response message, refactored