MUS-15 Modified some code parts while showing the code within the team