Changes copied from PC + ShinyIncubator added