Hopefully changed issues with main activity being updated