add other conditions to the form checking