update to try to make more stable