changes to support date instead of boolean