Added exit points instead of fields, for faster editing.