Work on fixing -nodrawers