Changes to make sure it would all work