updated prepareCreation