v0.2 - simplifications