Made more modifications