notes updated to match code