New Version with fix some bugs.