cleaned up for drawerfix implementation