Damn had a hard time merging my changes. Updatedbasic BuyActivity and [DConfirmActivity.