update from Pel Stockwell