Added editor mode