Construct 2 Templates

Updated