all shiny and worky for 0.5.16