Changed mobile code in annotation bugfix attempt
fixed conflict prior to merge