More pass two code