Sorted out segment stuff...