Created new logic version - ToRework