Correcting the errors captain pointed out