Feat/new yarn style