added functionality to handle the two new categories