post refactoring fixes