Implemented extra functions
Merged tabs branch with special func branch