IC-13 refactoring