working on the final pass