Davids fixes