updates as per dave memo