Fixed last of David's comments