Changed step ordering and tweaked production settings