Adhering to the last change made on the ECRSGEN project.