Changes suggested by MarkusHackspacher