Master works better with handheld devices now