Advanced this..
Some changes.