removed __dirname
putting stuff back