Making a more stable app