EBS building recoding. Still needs work.