Added in-class from 2014-10-16