Strapless Template update (part2)