fix all the oldness issuess