rework v0.1