tis working, api cleaner