updates to try to work better