fixed my mistakes from the last commitment