davis - issue fixes 7,6,5