Changed to modify core instead of overiding templates