updating API
merged API