Changes mentioned in #3