improve dependencies for 2.3