refactor with Jason.