updated to use common get handler