More refactor
fix for refactor