Still trying to realize my changes for #251.