removed .is references and own state manipulation. Updated to new should methods