Wout: changed some stuff around