Made more changes in class.