4/3/14 - changed some functions