Finished but haven't removed CompVal
Removed CompVal

Not needed