New invariant version looks to be working