added second template and better comments