Working on updating stuff