Initiator Creator - Issue 21