minor modfication