Template is more in line with the actual code
ChangeLog updated