mods from Steve Perkins; include from ../include not ..