Added the new files.
Fixed __call__ functions.