Moved Tags and function calls around