fixed the changes from helper function and merged the changes from local repository