Some more changes and almost done