Rewrote functions for IC 15, 16, deleted first implementations