Minor changes needed