#6 Fixes Bug, introduction of certification date logic and within range check