updated with new waterlock api