Changed everything to one pass.