BUGFIX: updated all functions to work with modification due to removal of cycle argument (previous commit from flo)