modifications suggested by Arcterus