update based on justin conversation