Did some refactor to new/create action