modifications suggested by Bananeweizen