incorporated all of James feedback