Move note to a more appropriate place