Added changes after meeting on 1/12