Version 2.6 reducing the dependencies