better response codes --KW