Final implementation of ics. Issue #39