adding method table
fixed merge conflict