added Martijn's input