updated adam, added ashley