working on pass two