Tried to do same chnges to the project, finally left them as a comment, because they have to be discussed with the team!