little bit of a work on api