added api-hack