Made more changes & additions