Made more changes