ote methods
merging in master