changed diff functions

removed old diff function
started using new diff functions