Modified according to the changes specified