API tuned up and working