updated with abadi