Correcting my mess up