updating subs
fixing conflict
adding commits for mtpocket