overhaulin ... almost there