updated to new API

New updates!