An easier option is to go with the O.S 21tm engine, less mucking around & no changing anything, it drops straight in & the easy start can also be used on it, less likely to break as many parts to. I just done it with mine & have just about got the engine fully broken in, well pretty much done, has had 7 tanks & is going great. Just a bit more tuning.