rewriting this a bit
small fix
fixing path stuff