added shiny stuff