Added a lot of updates