second round changes, mobile ready, rebuild