2nd commit with changes made after notes