4/4/14 - changed and added some functions