New ER according to changes made by Lisbeth