more drawer refac