Add extended spiral. Change spiral arguments order