minor error
Merge branch 'usedTransfer'
resolved conflicts