Changed the context for functions