some old changes commited here!