Some more edits, incorporating more E and T method