merged comments from 4.3-refactored