New api

Switched to new STW api