made data structure stricter