Version 3(1.2) and removeing some includes