Working version merging glaucoma changes in.