newest changes ready for css, all content added