More changes needed by IT setup (to be cleaned up)