rework v1.2