updated for case management