Makefile shuffle
Shelving reload handler