added messaging
merging templates