MAJOR CHANGE, see note. Now I start to remodelling markup