more from dev2
merged dev2