review that previous commits fixed #54