Customized to work along old bashrc