tweak functions for STRICT compliance