more smartness
0.2.2