Updated, less memory erros.