Minor changes and preparations