Adding comments
Changes for keeping context for func and 2 dictionary for context