Should be final update to directories