Drawer refactoring
rewrite the require statements