Couple of functions that should be static