Added first run check