Adrienne - refactored views