16Nov - 14.07

+foam's code, 1&2 work fine