Update of things that we need to complete