changes for basic creation and flow