Updated to include parameterized dates and updated beacon