pulled most recent changes from original template