Updated to work with changes to Drawer