Functions and Tester added