Changes for presentation on components