Improve AWS