Updating to the latest design