updated with cloud aws integration