Applied improvement-suggestion from dutch team 'Zouk Team'