fixxed old shit