Initial
Some changes including exception