added aws portion