previous commit on validating exit corrected
merged conflicts