[no merge yet] Feature/aws factor