added more shims