changes ready for contenation and slimit, working