Fixed ots, removed include, sparated it's functions