Fixed move

Voided the if's, simplified statement
Merge remote-tracking branch 'origin/oscbaBranch'