added temporary transition code