Changed to more intuitive function calls