Improve the top group algorithm

Edited by Mark Harding