Commit of changes made to classes in the CERA project

Committed the changes to the classes made in the CERA project.