Finished fix the dormitory/pick up export.