merged Andy's schemas