224 / 204: merged rlauck's golfing