More changes to dev