Combined more functions into the package