A few structural changes done