bd working
refactor, cwd