COMP: Checkpoint -- adding more functions