completed revamping decompilation