better logic / v0.2