Made more changes II