Minor changes to previous commit. To be tested