Drawer

again, extraneous checks