added update functionality & some changes.