updated with escape