Moved to new IC2 API and merged into master