Improve android