Changes based on fork analysis