Updated these files from Ric's feedback.