refactor to remove x:y:zs