Somethings left out

Some changes required