Heavy update to the MainActivity