Redo everything for v1.2.2