Updated with new variables and simhits