Changes made on tomgross