added few function updates
merge conflict