Escaping Enhancements

cheers!