Add flay to check duplication code