merged rjc123-olddepts