Messing with HanBin's code-- changes from dur meeting