Maybe make custom dir work