simplified template overriding
fixed template overriding