Jawad's initial changes + improvs