More mentor changes

less fiddly