Move responsibility to help reduce input needed