Work be done. Reworking Drawer