sidebars and lots of changes