The shop is *slightly* better organized...