More updates. Uses new API functionality