Should we extract our CS here?