Removed removed extra layer of scan / scan__