renamed to ich. removed extra functionality