Added feedback from Christian and Mark