+ added some old changes