New directory plus some modifications