Some quick modifications to #22