todo added to all functions