v1.2 - update base + new functional