added both functions to all