just few changes so I can work