Major upgrade beneath the skin to 1.5; functions now used extensively