Changed back to old kit api