Addressed issue of complete loading even if app not being launched for the first time