Added stage switching