Updated with Adams view changes