Work on drawer changes