WIP on adapting the profile desing