Made it specific to David
merged in ver01