got rid of the properties nesting and made the expire date more forgiving