Merged with latest template