MRich optics

They are sometimes causing a problem. Need to debug this.