Few more variable change