small update to validity-functions