Updating, fixing and testing!