Switched from KVO to NSNotification