review. Changed order of logic