fixed

Improved workstyle, updated for the new API version