Changes for #4-1, 5, 6, 7