Added final shims