added support for correct top set