Changes for issues 8, 9, 13, 14