Change to work on studentserver