added support for sweet 16 fields