still adding headmaster support