Adjusted Shifting logic for the boolean clutch
Fixed a few dependency issues