ran some tests... and updated some models therefore