Self-modifying API
Working pretty well