incorporated Dylans changes