more edits, and introduced SuB template