with removal functionality, scenarios updated