function names changed as discussed in pull req