Updating with some more done