Change to use new dir.