Few more changes -va
conflicts resolved