Fixing up api