added 7 functions; removed 4 functions