Merged in mbernadette's spirals