fixing up some of the shared stuff