Finished modifications to CH7