Changes made in Branch 2