more re-organizing, edited template