Some changes to Marcel F's improvements