some changes in the sideshow branch