Added more to functions