Code

Updated department handling.