WIP adjusting to get build under 50m