No longer uses 100% CPU