More complexity reduction