some changes. added measure to struct of