Small modification before merge