diff --git a/CovidAlertVaccinationModel/src/ABM/mixing_graphs.jl b/CovidAlertVaccinationModel/src/ABM/mixing_graphs.jl
index d3fe2329f46ccc611c6dae0b17d5b37e0fd43a34..7bfc2f8d2f6c7da06ea4c8eb2c596b8c3912f7af 100644
--- a/CovidAlertVaccinationModel/src/ABM/mixing_graphs.jl
+++ b/CovidAlertVaccinationModel/src/ABM/mixing_graphs.jl
@@ -36,7 +36,7 @@ Resample all the weights in `mixing_graph`
 function sample_mixing_graph!(mixing_graph)
     mixing_edges = mixing_graph.mixing_edges
     for i in 1:size(mixing_edges.contact_array)[1], j in 1:i  #diagonal            
-            rand!(RNG, mixing_edges.sampler_matrix[demo_i,demo_j],mixing_edges.sample_cache[i,j])
+            rand!(RNG, mixing_edges.sampler_matrix[i,j],mixing_edges.sample_cache[i,j])
             for k in 1:length(mixing_edges.contact_array[i,j][1])
                 kth_node_i = mixing_edges.contact_array[i,j][1][k]
                 kth_node_j = mixing_edges.contact_array[i,j][2][k]
diff --git a/CovidAlertVaccinationModel/src/ABM/solve.jl b/CovidAlertVaccinationModel/src/ABM/solve.jl
index 5a9d52fec15984de74c5593da405ddbd8ed6cf46..447011708fa0766f317f55c560832172c19a0c3d 100644
--- a/CovidAlertVaccinationModel/src/ABM/solve.jl
+++ b/CovidAlertVaccinationModel/src/ABM/solve.jl
@@ -2,7 +2,7 @@
 function contact_weight(p, contact_time) 
     return 1 - (1-p)^contact_time
 end
-function update_alert_durations!(t,modelsol)  
+Base.@propagate_inbounds @views function update_alert_durations!(t,modelsol)  
     @unpack notification_parameter = modelsol.params
     @unpack time_of_last_alert, app_user_index,inf_network,covid_alert_times,app_user = modelsol
     for (i,node) in enumerate(modelsol.app_user_index), mixing_graph in modelsol.inf_network.graph_list[t]
@@ -21,7 +21,7 @@ function update_alert_durations!(t,modelsol)
     end
 end
 
-function update_infection_state!(t,modelsol)
+Base.@propagate_inbounds @views function update_infection_state!(t,modelsol)
     @unpack base_transmission_probability,immunization_loss_prob,recovery_rate = modelsol.params
     @unpack u_inf,u_vac,u_next_inf,u_next_vac,demographics,inf_network,status_totals = modelsol
     
@@ -64,7 +64,7 @@ function update_infection_state!(t,modelsol)
     end
     # display(u_next_inf)
 end
-function update_vaccination_opinion_state!(t,modelsol,total_infections)
+Base.@propagate_inbounds @views function update_vaccination_opinion_state!(t,modelsol,total_infections)
     
     @unpack π_base, η,γ, κ, ω, ρ, ω_en,ρ_en,γ,β = modelsol.params
     @unpack demographics,time_of_last_alert, nodes, soc_network,u_vac,u_next_vac,app_user,app_user_list = modelsol
@@ -116,7 +116,7 @@ function agents_step!(t,modelsol)
     remake!(modelsol.inf_network,modelsol.index_vectors,modelsol.ws_matrix_tuple.daily)
     remake!(modelsol.soc_network,modelsol.index_vectors,modelsol.rest_matrix_tuple.daily)
     for network in modelsol.inf_network.graph_list[t]
-        sample_mixing_graph!(network,modelsol.demographics) #get new contact weights
+        sample_mixing_graph!(network) #get new contact weights
     end
 
     update_alert_durations!(t,modelsol)