Added a whole lot of shims