added new includes so that it works on laptop AND PC AND uni