Applied new design to old task logic