Updating the code for 1.3.1