11/10/14 - some changes