implement what David suggested on e-mail