refactored null make