Minor changes, fast mode