2nd commit with changes after notes