added some things, something now should work