Ammending again the latest code for testing