Even more testing, hoping to remove that awful icon