adding loc stuff back in