Minor update to the code