Completed working class for EPRR