revised templates