fixing init according to mattheath aproach