new eff areas
minor cleaning