fixed deadlock, added shelves module