organizing for latest api