remove ambush add conceptual marking and ++