Prepared for next version.