Updating with latest changes for development