fixed to work with new pyhsmm organization