Some more changes added. Almost wrapping up