Some changes on code.