updates to make errors go away again