after fixing api