Updating after that whole error mess