Worked on affix logic