multipley note to shift
Merge branch 'working'