My A3 block is getting tired and sourced a a2 block with oil pump etc...I'm wondering if anyone else has done this...I'm waiting for the block to return from the machine shop but was wondering does everything bolt on direct...only upgrades are piston n rods...any other tips are appreciated