Be prepared for the next version