Function renamed.
A function added to combine the previous two into one. Function not working yet. So old funtions still in use.