cosmetic change and todo