some changes to the include and stuff
some small changes to include file