Code

Updated department handling