add extra validation