Sorted everything out