Jeff, you may want to require a pipe and header change if the engine is changed. If you don't you could end up with a ST with an old Aqua header and pipe. Don't know if it would be an advantage or not but it may be a good idea to lock it down so the issue doesn't come up. By the way, great job...