merged work with peter, spent time fixing mobile