Added changes made at SIAM CSE