begin to work on consistency of the two templates