updates - in progress
need more work