add a bit more static goodness