Initial creation and some modification