Modified to follow notification changes