@ohadlevy, noted, will work on DRYing this later.