Added note checking