Testing commit from bakker xp machine