merged with studentperm changes