updated based on comments from department