Big overhaul, much clearer now