smitty's changes
merged
merging modev