Added all the latest code