Changed creation logic.