Finished logic review