Another pass through this mess