additions to the create function
merge from master