Streamlined

Streamlined the system scan