Full update. Megre to original BEM style.