Nice job! Let me know where you will be buying as I may go the whole hog and replace as much as possible if I do the B3 upgrade too