New API calls
Removed commented code