Added deferred first pass