v0.1.2 ------ decrease complexity a bit