Adjustments based on recommendations from @Kondou-ger.