More modifications

More modifications

Signed-off-by: Robert Coscia <coscia@g.harvard.edu>