Review to eliminate some errors