Fix cola tokens
Add functions