A few changes in create code
Some changes