Restructured from 1.0 feedback