Added package check, might cause more delay on initial launch