more possible slight complexity reduction