Adding removing functions + sample <-> step calculations