Updated with Brian's edits