Small changes from Rader