Added all Z shapes to complete fit (for completeness)