function names changes and minor updations