improved affix functionality