fixed up shiny2 real nice