Small changes needed