Issue #9 Update static working except measurement type.