messing with oti setup
merging changes
minor edit