adding John's stuff