Api update, almost done