Some template modifications part 2