adapt last jenny style, improve workflow