#2 - Implemented rescan function