Suggestions by @FioraAeterna