continuing on refactopring