Changes on Add function