New modifications as of 11/08/13