merged dave and my version