hopefully both templates are happy now