improved mobile generation