fixing diff and adding new templates