Adding in the latest changes