Added more suggestions made by @xabbuh