fixing the mess up