Added more functions and flows