updates
unifying templates