few changes, trying to get include() to work (not yet)