Changes to be more stable