Adrian - changes