Updated to be less cv