-Accepted code changes from Maria
-Accepted code changes from Maria for a better function and deleted the old version of it.