improve validator logic more