adapt tutorial for new measures implementation