Some changes...
Some changes...part two :)