Continued updates to dev branch