better logic, v0.0.4
better logic, v0.0.4