Restructurize, bug fixing with infity attack