removed paid_date check + design improvement