Added additional prototype.  Few Bug fixes.