hacky preparation for list-changing