addressed comments
hack for UseSMT