UPDATE: various tweaks for FS [Code Aurora] --FAST!!