Extra validation rules #60
 Extra validation rules #60 pt2