martin's commit with the new working form