Adding escape option