Got end marker to work, although it's quite slow