Removed  unnecessary invalidates