change some function for oriented