changes for logging and standard diff jar