added non-tracking functionalities