Updated create function.
Merge changes.