Allow more customization
Merge branch 'proper-flow'