Updted the code again