Rescanning progress

Testing still in progress. Will update once testing finished.