Added the ability to specify an alternative dir using