TOP / More by partial improvements

More by partial improvements