Added the main functions but no test