Ads Logic slightly changed. Testing still to do