Changes and updates, especially for 3-4