API update. Added cases
more work on DEBUG cases