Hide lines properly
Make some shapes not match