Bringing changes over from 3.0