re-ordered stage, added graph