changes on daves branch