Revised from One Note