Finished
Some changes