Diederik's additions