Commit 50:Lots of updates added