Incorporate Aldric's suggestions