change in Q R- no null
change in q to j
Merge origin/master