Round two after cassie's notes