Modifying the code fro testing