updates based on josh and dave