added support for super ones