Changing pattern (Part III) and Tests improved