Changed load order, new grant initalization fixed