Futher separted logic.