updates to fix!!!