Modified API Function