New includes and some modifications