Changes according to comments 2014-12-02.