added note and measure structs