Added more functions, clarity