Removed raise statement to allow for cpis to be external