Improved ic_source design