Creation is done in one place with the correct file created, not both