slight changes and AsyncTask implementation