new update, still few things to be done