Some changes and error fixed.