Updated with the latest code