move logic to original spot