Rewrote functions for IC 20, 21, deleted first implementations