commenting/moving to API format