Added Grips and modified Square Catch