In the works for v1.3 - update