17 better than 30

At least for falcon which i didn't manage to add to customs