conv fix
new functions implemented
conflict resolved