fixed up api