Few code changes