shiny updated, have to clean up code