some performance improvements on added/removed