That would probably be the plan. I think a 2.6L or 2.8L is possible in the space available. An upgrade to the Roe setup to get more power potential is really needed to stay competitive down the road as other systems become cheaper. A new compressor and snout which could also be an upgrade to existing systems and add another 100HP or so at a decent price would breath new life into the system.