made stricter validation