Updates based upon feedback from sgilda