0.0.4
simplify a little bit