Complying with @exhuma's comments/requests