setting back to how the logic should be