Some changes has been made