dynamic validation partially added